typedef:ed BABL free and malloc function pointers.

2008-03-23  Martin Nordholts  <martinn@svn.gnome.org>

	* babl/babl-memory.[ch]: typedef:ed BABL free and malloc function
	pointers.

svn path=/trunk/; revision=296

diff --git a/ChangeLog b/ChangeLog
index cf4e4746fcc780140763e048e81ab26781a15fbb..cbe0abfde1ac57df8eda5ea425260a9c44a32b6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-23  Martin Nordholts  <martinn@svn.gnome.org>
+
+       * babl/babl-memory.[ch]: typedef:ed BABL free and malloc function
+       pointers.
+
 2008-03-22  Sven Neumann  <sven@gimp.org>
 
        Applied patch from Jan Heller that introduces list and hash table

diff --git a/babl/babl-memory.c b/babl/babl-memory.c
index a5b407e413bbb1e9473a06ee7a4a74176d808b1a..20f5a62bd63de4e62ea8a3a33ead56696a33e0ad 100644 (file)
--- a/babl/babl-memory.c
+++ b/babl/babl-memory.c
@@ -21,20 +21,20 @@
 #include <string.h>
 #include "babl-internal.h"
 
-static void *(*malloc_f)(size_t size) = malloc;
-static void  (*free_f)(void *ptr)     = free;
+static BablMallocFunc malloc_f = malloc;
+static BablFreeFunc   free_f   = free;
 
 static void *first_malloc_used = NULL;
 static void *first_free_used   = NULL;
 
 void
-babl_set_malloc (void *(*malloc_function)(size_t size))
+babl_set_malloc (BablMallocFunc malloc_function)
 {
   malloc_f = malloc_function;
 }
 
 void
-babl_set_free (void (*free_function)(void *ptr))
+babl_set_free (BablFreeFunc free_function)
 {
   free_f = free_function;
 }

diff --git a/babl/babl-memory.h b/babl/babl-memory.h
index b46dcc39fe783007dafa1c649530b78731407639..b4e0d818a7eccaae5a9f00e5c8480fc2ddaf3703 100644 (file)
--- a/babl/babl-memory.h
+++ b/babl/babl-memory.h
@@ -19,8 +19,13 @@
 #ifndef _BABL_MEMORY_H
 #define _BABL_MEMORY_H
 
-void   babl_set_malloc    (void     *(*malloc_function) (size_t  size));
-void   babl_set_free      (void      (*free)            (void   *ptr));
+
+typedef void * (* BablMallocFunc) (size_t size);
+typedef void   (* BablFreeFunc)   (void  *ptr);
+
+
+void   babl_set_malloc    (BablMallocFunc malloc_function);
+void   babl_set_free      (BablFreeFunc   free_function);
 int    babl_memory_sanity (void);
 
 void * babl_malloc        (size_t      size);